From 78559a477ba0deb03a4b279475606ff3c09efe31 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 4 Jan 2013 10:06:47 +0100 Subject: [PATCH] passthrough/domctl: use correct struct in union This appears to be a copy paste error from c/s 23861:ec7c81fbe0de. It is safe, functionally speaking, as both the xen_domctl_assign_device and xen_domctl_get_device_group structure start with a 'uint32_t machine_sbdf'. We should however use the correct union structure. Signed-off-by: Andrew Cooper Committed-by: Jan Beulich --- xen/drivers/passthrough/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 1cd0007542..2d584d2a77 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -591,7 +591,7 @@ int iommu_do_domctl( if ( ret ) break; - seg = domctl->u.get_device_group.machine_sbdf >> 16; + seg = domctl->u.assign_device.machine_sbdf >> 16; bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff; devfn = domctl->u.assign_device.machine_sbdf & 0xff; @@ -615,7 +615,7 @@ int iommu_do_domctl( if ( ret ) break; - seg = domctl->u.get_device_group.machine_sbdf >> 16; + seg = domctl->u.assign_device.machine_sbdf >> 16; bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff; devfn = domctl->u.assign_device.machine_sbdf & 0xff; @@ -634,7 +634,7 @@ int iommu_do_domctl( if ( ret ) break; - seg = domctl->u.get_device_group.machine_sbdf >> 16; + seg = domctl->u.assign_device.machine_sbdf >> 16; bus = (domctl->u.assign_device.machine_sbdf >> 8) & 0xff; devfn = domctl->u.assign_device.machine_sbdf & 0xff; -- 2.30.2